Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Karkakol/add active simulcast encodings #56

Merged
merged 24 commits into from
Jan 25, 2024

Conversation

karkakol
Copy link
Member

No description provided.

# Conflicts:
#	MembraneRTC/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/RTCEngineCommunication.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/SimulcastConfig.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/models/Endpoint.kt
# Conflicts:
#	MembraneRTC/src/main/java/org/membraneframework/rtc/InternalMembraneRTC.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/RTCEngineListener.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/events/Event.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/models/Endpoint.kt
#	MembraneRTC/src/main/java/org/membraneframework/rtc/models/TrackContext.kt
@karkakol karkakol requested review from incubo4u and graszka22 and removed request for incubo4u January 16, 2024 15:51
.idea/gradle.xml Outdated
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="Embedded JDK" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's weird, is it needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

file should be ignored

@@ -7,13 +7,15 @@
</inspection_tool>
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
<option name="composableFile" value="true" />
<option name="previewFile" value="true" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's also weird, also is it needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right, .idea shoud be git ignored

import org.membraneframework.rtc.utils.Metadata

data class Endpoint(
val id: String,
val type: String,
val metadata: Metadata? = mapOf(),
val trackIdToMetadata: Map<String, Metadata?> = mapOf()
val trackIdToMetadata: Map<String, Metadata?> = mapOf(),
val tracks: Map<String, TracksAdded.Data.TrackData>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too we have trackIdToMetadata and tracks, if it's user facing class it would be confusing

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also an endpoint might be a local endpoint, do we update it in that case?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it's user facing it doesn't look nice to me (the TracksAdded.Data.TrackData type is too long and TracksAdded event is not user facing. Consider creating a new type maybe?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary data is removed

Copy link
Collaborator

@graszka22 graszka22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also did you check my comment:

Also an endpoint might be a local endpoint, do we update it in that case?

import org.membraneframework.rtc.SimulcastConfig
import org.membraneframework.rtc.utils.Metadata

data class TrackData(val metadata: Metadata?, val simulcastConfig: SimulcastConfig?)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You may document this too if it's user-facing

@karkakol karkakol merged commit 2a5cd51 into master Jan 25, 2024
1 check passed
@karkakol karkakol deleted the karkakol/make_metadata_nullable branch January 25, 2024 11:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants